Olaf adds read support for MS Autoroute.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 52727d918cc9a01a905f21292e81ae530095b3f1..1de963c662ab7c8b4e3a581e795b39539516ece9 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -39,7 +39,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
        igc.o brauniger_iq.o shape.o hiketech.o glogbook.o coastexp.o \
        vcf.o overlay.o kml.o google.o lowranceusr.o an1.o tomtom.o \
        tef_xml.o maggeo.o pathaway.o vitosmt.o gdb.o bcr.o coto.o \
-       ignrando.o stmwpp.o
+       ignrando.o stmwpp.o msroute.o
 
 FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o trackfilter.o discard.o
 
@@ -215,6 +215,7 @@ main.o: main.c defs.h queue.h gbtypes.h
 mapsend.o: mapsend.c defs.h queue.h gbtypes.h mapsend.h magellan.h
 mapsource.o: mapsource.c defs.h queue.h gbtypes.h garmin_tables.h
 mkshort.o: mkshort.c defs.h queue.h gbtypes.h
+msroute.o: msroute.c defs.h queue.h gbtypes.h
 navicache.o: navicache.c defs.h queue.h gbtypes.h cet_util.h
 netstumbler.o: netstumbler.c defs.h queue.h gbtypes.h csv_util.h
 nmea.o: nmea.c defs.h queue.h gbtypes.h

diff --git a/gpsbabel/README b/gpsbabel/README
index 5c49caafbc87231666f3dfcb22c4347d9ed55154..269aa9dabc28b0d536481c18698ac7910b4778ea 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -1051,6 +1051,13 @@ THE FORMATS
        
        index - Use route/track number <index> from input data for output.
 
+    MSroute
+    
+       Input support for Microsoft AutoRoute 2002 .axe files. 
+       These files contains only routes. We can extract the coordinates
+       and the names of the points within route. An export to this format
+       will not be supported.
+
 DATA FILTERS
 
         GPSBabel supports data filtering.  Data filters are invoked from

diff --git a/gpsbabel/reference/route/msroute-sample.axe b/gpsbabel/reference/route/msroute-sample.axe
new file mode 100644 (file)
index 0000000..299f8e1
Binary files /dev/null and b/gpsbabel/reference/route/msroute-sample.axe differ

diff --git a/gpsbabel/reference/route/msroute-sample.gpx b/gpsbabel/reference/route/msroute-sample.gpx
new file mode 100644 (file)
index 0000000..677d4d8
--- /dev/null
+++ b/gpsbabel/reference/route/msroute-sample.gpx
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx
+ version="1.0"
+creator="GPSBabel - http://www.gpsbabel.org"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.topografix.com/GPX/1/0"
+xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
+<time>1970-01-01T00:00:00Z</time>
+<rte>
+  <rtept lat="50.497369766" lon="12.135772705">
+    <name>Plauen</name>
+  </rtept>
+  <rtept lat="50.540628433" lon="12.311897278">
+    <name>Treuen</name>
+  </rtept>
+  <rtept lat="50.533161163" lon="12.400903702">
+    <name>Rodewisch</name>
+  </rtept>
+  <rtept lat="50.537710190" lon="12.521152496">
+    <name>Stützengrün</name>
+  </rtept>
+  <rtept lat="50.545692444" lon="12.565097809">
+    <name>Hundshübel</name>
+  </rtept>
+  <rtept lat="50.576334000" lon="12.651100159">
+    <name>Zschorlau</name>
+  </rtept>
+  <rtept lat="50.592212677" lon="12.696161270">
+    <name>Aue</name>
+  </rtept>
+  <rtept lat="50.562858582" lon="12.730407715">
+    <name>Lauter</name>
+  </rtept>
+  <rtept lat="50.542688370" lon="12.785682678">
+    <name>Schwarzenberg</name>
+  </rtept>
+  <rtept lat="50.531187057" lon="12.876577377">
+    <name>Markersbach</name>
+  </rtept>
+  <rtept lat="50.558910370" lon="12.953481674">
+    <name>Schlettau</name>
+  </rtept>
+  <rtept lat="50.565433502" lon="12.998456955">
+    <name>Talstraße, 09456 Annaberg-Buchholz</name>
+  </rtept>
+  <rtept lat="50.580625534" lon="12.987041473">
+    <name>Frohnau</name>
+  </rtept>
+  <rtept lat="50.628261566" lon="12.929792404">
+    <name>Geyer</name>
+  </rtept>
+  <rtept lat="50.628690720" lon="12.814950943">
+    <name>Zwönitz</name>
+  </rtept>
+  <rtept lat="50.578479767" lon="12.811260223">
+    <name>Grünhain</name>
+  </rtept>
+  <rtept lat="50.564661026" lon="12.791776657">
+    <name>Beierfeld</name>
+  </rtept>
+  <rtept lat="50.525865555" lon="12.768001556">
+    <name>S274</name>
+  </rtept>
+  <rtept lat="50.499515533" lon="12.651443481">
+    <name>Sosa</name>
+  </rtept>
+  <rtept lat="50.518140793" lon="12.621316910">
+    <name>Blauenthal</name>
+  </rtept>
+  <rtept lat="50.506038666" lon="12.526988983">
+    <name>Schönheide</name>
+  </rtept>
+  <rtept lat="50.511016846" lon="12.456779480">
+    <name>Schnarrtanne</name>
+  </rtept>
+  <rtept lat="50.525093079" lon="12.416524887">
+    <name>K7820</name>
+  </rtept>
+  <rtept lat="50.533161163" lon="12.400903702">
+    <name>Rodewisch</name>
+  </rtept>
+  <rtept lat="50.540628433" lon="12.311897278">
+    <name>Treuen</name>
+  </rtept>
+  <rtept lat="50.553760529" lon="12.277307510">
+    <name>A72, 08233 Treuen</name>
+  </rtept>
+</rte>
+</gpx>

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 4cc088d35634818211e417969e3ca12ad4660701..2f1c8789b0caf825db98a68c856fe5274b704239 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -853,4 +853,10 @@ compare ${TMPDIR}/stmwpp-route.gpx reference/route/stmwpp-route.gpx
 ${PNAME} -i stmwpp -f reference/route/stmwpp-route.txt -o stmwpp -F ${TMPDIR}/stmwpp-route.txt
 compare ${TMPDIR}/stmwpp-route.txt reference/route/stmwpp-route.txt
 
+#
+# Microsoft AutoRoute 2002 test (read-only)
+#
+${PNAME} -i msroute -f reference/route/msroute-sample.axe -o gpx -F ${TMPDIR}/msroute-sample.gpx
+compare ${TMPDIR}/msroute-sample.gpx reference/route/msroute-sample.gpx
+
 exit 0

diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index 9fb4d0c01c8f4bd958bd3b7163adec46ab0d501f..12a3d5944b75400045983384e23eaab6aea2a327 100644 (file)
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -89,6 +89,8 @@ extern ff_vecs_t coto_vecs;
 extern ff_vecs_t ignr_vecs;
 extern ff_vecs_t stmwpp_vecs;
 
+extern ff_vecs_t msroute_vecs;
+
 static
 vecs_t vec_list[] = {
        /* XCSV must be the first entry in this table. */
@@ -442,6 +444,12 @@ vecs_t vec_list[] = {
                "Suunto Track Manager (STM) WaypointPlus files",
                "txt"
        },
+       {
+               &msroute_vecs,
+               "msroute",
+               "MS AutoRoute 2002",
+               "axe"
+       },
        {
                NULL,
                NULL,